fixed magic getter
refactor