Fix for formatting pattern issues