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

@Lynngre Can you check that for us please?