Fixiing issue #16