diff --git a/script/fixes/014_note_ranges.rb b/script/fixes/014_note_ranges.rb
index 884ff7a46..adbe220ab 100644
--- a/script/fixes/014_note_ranges.rb
+++ b/script/fixes/014_note_ranges.rb
@@ -6,8 +6,16 @@ ActiveRecord::Base.connection.execute("set statement_timeout = 0")
 
 Note.update_all("x = 0", "x < 0")
 Note.update_all("y = 0", "y < 0")
-Note.update_all("x = 0", "x > (select _.image_width from posts _ where _.id = notes.id limit 1)")
-Note.update_all("y = 0", "y > (select _.image_height from posts _ where _.id = notes.id limit 1)")
+Note.update_all("x = 0", "x > (select _.image_width from posts _ where _.id = notes.post_id limit 1)")
+Note.update_all("y = 0", "y > (select _.image_height from posts _ where _.id = notes.post_id limit 1)")
+
+Note.where("x > (select _.image_width from posts _ where _.id = notes.id limit 1)").find_each do |note|
+  note.update_column(:x, note.versions.last.x)
+end
+
+Note.where("y > (select _.image_height from posts _ where _.id = notes.id limit 1)").find_each do |note|
+  note.update_column(:y, note.versions.last.y)
+end
 
 Post.where("created_at >= '2013-02-01'").select("id, score, up_score, down_score").find_each do |post|
   fav_count = Favorite.where("post_id = #{post.id}").joins("join users on favorites.user_id = users.id").where("users.level >= ?", User::Levels::GOLD).count