Fix per dustin's review