Fix bnes, not best solution