fixed #1 after testing