fixes issue #2633
Merge pull request #2713 from FinalAngel/fixes/2633

fixes issue #2633