Here's hoping this would make lint happy