#57 prev commit compability fix