attempt to solve #950