Trying to solve #789