Fixed #37 (rv1)