Fixed bad parsing.

TODO: Fix image parsing issue