Fix aesthetics leaking problem (Fix #225)