Fixing issues #40 and #41