Minor Bug Fix from last Commit