Found a better way to fix issue #37 : Right expansion animation not working properly