diamond bug fixed