FIX: Too many curly-brackets