Reverted change. caused segfault