Fix of temporary workarround