Fixes #3334
Merge pull request #3335 from deadlybutter/fixes3334

Fixes #3334