fixes

It works properly now and can be placed at the bottom of the init
instead.