Fix for v.1.7.2 and remove features