Update for further fixes for #557.
Update for further fixes for #557.

Signed-off-by: Chris Sanders <06416fb6a0043b161a532939086201b4a528222d@home.inspirenxe.org>

SpongePowered/SpongeVanilla,SpongePowered/SpongeVanilla