Fixes | Frifor