Corrected base-handler on 0.2.0 branch