Another improvement for the nerverending #56