removed some code duplication in Fake