Fix get-methods