Added workaround to prevent exception