bug fix
merged changes from clyde