Arghs, damn it, fix