Alpha 1.1 fix