Fixed 4.10 version compatibility (at least a bit)