Fixed missing semicolons, and removed unnecessary fallback