hopefully fixed return issues