Conservative fix for chunk loading issues - should be revisited later.

Signed-off-by: Ross Allan <rallanpcl@gmail.com>