PR305 is now fixed