Fix for trailing ,