Removed faq bugfix (should not go in this branch)