attempt to solve #1152