removed workaround for shpp