Fixed #10, Fixed #15

Temporary workaround for #14.