Amethyst on Windows (MSVC)

I am trying to run the Pong example for Amethyst 0.4.1 but it panics with the following error which happen in gfx dependency:

Running `target\debug\examples\pong.exe`
thread 'main' panicked at 'attempt to subtract with overflow', <gfx_impl_struct_meta macros>:26

Now, I know that this specific issue is solved in the commit below. However, trying to [replace] the gfx crate in Cargo.toml with this commit breaks Amethyst compilation.
https://github.com/gfx-rs/gfx/commit/d8954365c2ec54d65af002a827a9bf76132f8192

What should I do?

E: I am using nightly-x86_64-pc-windows-msvc