Fixed #35, #36