BUGFIXES: related to previous commits