#251 fixed and polished