Hacky fix for JSON deserialization issue #15