Fork to fix bugs discovered