fixes #40 & #41