6 Commits (amiga-fix)