Removed unnecessary part, reverted #23 (not working)