Fixed and merged