Fixed issue #1 in testing