Fix for the only thing I hate about JWA


#1