Handle post bug fixed