[#241][#228][#226][#64] Fixed