Added workaround for snapshot deployment problem