Patched correctly to use in hasgeek-baseframe