possibly fixed for real this time (fixed DB connections)