see #5

fixes for bug #5