Fix #53, fixing potential SQL injection