For handling issues like #757
For handling issues like #757