TODO: Fix problem with return.