bugfix - closes #52