small fix
merged changes