fix according to issue #1