Come on, fixes #3