BUGFIX : Possible linked list bug