Fixing small problem with parsing