Small/Medium bug fixed