small fail-safe fixs