bug fixing

You can remove these two altogether if they're not required.