trying to solve #249