small modofication for issues mentioned by claynon