Fixed more issues related to issue #8