Fixed #37 (rv2)