Fixed code according to the Astakos v0.15.