Bugfix for eea41fea2689d6f8da67ef9badd6277b57b1c14f