Temporal fix for the issue with disappearing shape