MINOR BUGFIX(NEEDS IMPLENTING)