fixes #3626
:thumbsup:
rebased onto 4a55f6d0dc6d6cad25535b658ad931ff24eea03c
Pull-Request has been merged by ryanlerch
fixes #3626