solve this problem a bit more comfortable