Make things easier

This should fix our problems.