Workaround for MW bug