Fix #2093

Signed-off-by: John Rayes <live627@gmail.com>
Merge pull request #2096 from live627/dev

Fix #2093