undo hack, and make proper configuration