fixes #129 & #130