Fix for #2 and #3

See commits ;-)