Hopefully fix registration