fixes #955 #956