Improved check in 5.4