Hopefully fixed registration