facade fixes #3