quick fix for positioning - should refactor