Workaround for JWS-61 that resolves JAL-1127