Workaround for mpylayer issue 13