Fix size check & improve output