Allowing default stage override (fix #7)