do this at once instead of calling the same method twice

do this at once instead of calling the same method twice #516