fixes #2089


@Raydiation @LukasReschke @VicDeo THX