Really fixed #4