Workaround / fix for some weird bug