#319 - Fix for locking selections