Library
fixed to work with 3.0.5+