Bug Fix #4.2a It's late so many errors