one more server-side check to completely Fix #25.