Terrible hack to make live preview work, updates #28 but does not resolve it!