properly fixed #2