FIXED: Some issues with 3eb054e