Re issues #4 #36 #41 #43