fix for https://basecamp.com/2438620/projects/4181957/todos/127250831#comment_201404784