Reintroduce the fix from the #1502 to #1515
Reintroduce the fix from the #1502 to #1515

baotingfang/stylus,jangarcia/stylus,modulexcite/stylus,peterkinalex/stylus-1,angryrobot/stylus,SimenB/stylus,trixter5/stylus,Zagorakiss/stylus,johnnycopperstone/stylus,cemoulto/stylus,galenvagen/stylus,meteor/stylus,Delapouite/stylus,HossainKhademian/Stylus,tyv/stylus,ThiagoGarciaAlves/stylus,jameswomack/stylus,yetone/stylus,Ricardh522/stylus,PeterWangPo/stylus,a-x-/stylus,jonpacker/stylus,behzad88/stylus,stylus/stylus,silvaemota/stylus