speed fix - undone because of strange problems