Fix bug in display function
Merging 0.4