Fix for adding entities in Chrome