Fixed: Made last fix more robust