fixed more monarch 2.0 compatibility