Fixes May #1