Fixing alternatives some more