Fixed more bugs like issue #10