Slightly improve behavior of moving objects in library. A problem still remains