attempt to solve #2