Fixing #5, #6