Fix master

fixes #484