[#55] Bug fixes