Fixed to work with non-inception hacks