Fix read-only read-write handler
#142
+6
−6
Merged