Added patch to fixx issue #12