[BF] Fix #60 - issues with PostgreSQL