merge fix (method looks like it was removed on branch)