Quick fix to support space character #5