Fixed minor bug
Work in progress