try to solve #1308