Fixed #37, #36