Fix #292 part3
Merge pull request #296 from skywave/fix_292_3

Fix #292 part3