Work around bug by using @Configuration