This comment from @bdunogier needs to be taking care of