Fixed Errors Introduced by Commit 00c0307