Fixed back stack handling