BUGFIXES: #3 and #4