Fixes #133. Corrects issue where content layouts were being decoded twice