fixes issue #3003
Merge pull request #3014 from FinalAngel/develop

fixes issue #3003