bug fixes, really fixed #14