Last Minute Bug Fix