Small fix
Thanks
fixing merge problems