Fix for listing