attempt to solve #289