source view fix... though code is still not copy-pastable yet