Less mandatory 'oh crap i forgot something again' fix