Fixed a database issue. Thanks to UMINHO which is testing against a real scenario.